Merge pull request #144 from gpsbabel/fix_bad_merge
authorRobert Lipe <robertlipe@users.noreply.github.com>
Sun, 15 Apr 2018 07:41:32 +0000 (02:41 -0500)
committerGitHub <noreply@github.com>
Sun, 15 Apr 2018 07:41:32 +0000 (02:41 -0500)
commita0167f2b12b20b2494861da603d4de4e30655d4f
tree196a82164572cce3922f3dcb871584118d7adb33
parent8cd04927d4b9afec16a50bd9bed66b075d7eb69c
parent7d094db294053d765dc4a2aa2710249935be3d6f
Merge pull request #144 from gpsbabel/fix_bad_merge

Loosen coupling of upgrade queries to OS version by using newer (2014) Qt services.
gui/app.pro
shape.cc